From 026542e29f5d4546b7b4744fd48391c2b802ec4b Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Wed, 28 Jan 2004 23:56:50 +0000 Subject: [PATCH] Don't leak path if we bail out early. (#132505, Christian Persch) Thu Jan 29 00:59:03 2004 Matthias Clasen * gtk/gtktreemodelfilter.c (gtk_tree_model_filter_rows_reordered): Don't leak path if we bail out early. (#132505, Christian Persch) --- ChangeLog | 5 +++++ ChangeLog.pre-2-10 | 5 +++++ ChangeLog.pre-2-4 | 5 +++++ ChangeLog.pre-2-6 | 5 +++++ ChangeLog.pre-2-8 | 5 +++++ gtk/gtktreemodelfilter.c | 5 ++++- 6 files changed, 29 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 4c5453b47e..de3252592c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Thu Jan 29 00:59:03 2004 Matthias Clasen + + * gtk/gtktreemodelfilter.c (gtk_tree_model_filter_rows_reordered): Don't leak + path if we bail out early. (#132505, Christian Persch) + Thu Jan 29 00:48:47 2004 Matthias Clasen * gtk/gtkactiongroup.c (gtk_action_group_add_toggle_actions_full): diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 4c5453b47e..de3252592c 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,8 @@ +Thu Jan 29 00:59:03 2004 Matthias Clasen + + * gtk/gtktreemodelfilter.c (gtk_tree_model_filter_rows_reordered): Don't leak + path if we bail out early. (#132505, Christian Persch) + Thu Jan 29 00:48:47 2004 Matthias Clasen * gtk/gtkactiongroup.c (gtk_action_group_add_toggle_actions_full): diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 4c5453b47e..de3252592c 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,8 @@ +Thu Jan 29 00:59:03 2004 Matthias Clasen + + * gtk/gtktreemodelfilter.c (gtk_tree_model_filter_rows_reordered): Don't leak + path if we bail out early. (#132505, Christian Persch) + Thu Jan 29 00:48:47 2004 Matthias Clasen * gtk/gtkactiongroup.c (gtk_action_group_add_toggle_actions_full): diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 4c5453b47e..de3252592c 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,8 @@ +Thu Jan 29 00:59:03 2004 Matthias Clasen + + * gtk/gtktreemodelfilter.c (gtk_tree_model_filter_rows_reordered): Don't leak + path if we bail out early. (#132505, Christian Persch) + Thu Jan 29 00:48:47 2004 Matthias Clasen * gtk/gtkactiongroup.c (gtk_action_group_add_toggle_actions_full): diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 4c5453b47e..de3252592c 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,8 @@ +Thu Jan 29 00:59:03 2004 Matthias Clasen + + * gtk/gtktreemodelfilter.c (gtk_tree_model_filter_rows_reordered): Don't leak + path if we bail out early. (#132505, Christian Persch) + Thu Jan 29 00:48:47 2004 Matthias Clasen * gtk/gtkactiongroup.c (gtk_action_group_add_toggle_actions_full): diff --git a/gtk/gtktreemodelfilter.c b/gtk/gtktreemodelfilter.c index 527fa6bdd3..89b7e1a57e 100644 --- a/gtk/gtktreemodelfilter.c +++ b/gtk/gtktreemodelfilter.c @@ -1719,7 +1719,10 @@ gtk_tree_model_filter_rows_reordered (GtkTreeModel *c_model, } if (level->array->len < 1) - return; + { + gtk_tree_path_free (path); + return; + } /* NOTE: we do not bail out here if level->array->len < 2 like * GtkTreeModelSort does. This because we do some special tricky -- 2.30.2